From 1c421373981c375022286649cd5f0c45e7d6dabf Mon Sep 17 00:00:00 2001 From: "kaf24@scramble.cl.cam.ac.uk" Date: Fri, 12 Mar 2004 11:04:53 +0000 Subject: [PATCH] bitkeeper revision 1.782.1.1 (40519955rMBgGJDIn0x9xwhUTOT17w) mkbuildtree: Fix mkbuildtree script. No longer depend on broken lndir-rel. .del-lndir-rel~746e79fa104b53af: Delete: xenolinux-2.4.25-sparse/lndir-rel --- .rootkeys | 1 - xenolinux-2.4.25-sparse/lndir-rel | Bin 15929 -> 0 bytes xenolinux-2.4.25-sparse/mkbuildtree | 37 ++++++++++++++++++++++++---- 3 files changed, 32 insertions(+), 6 deletions(-) delete mode 100755 xenolinux-2.4.25-sparse/lndir-rel diff --git a/.rootkeys b/.rootkeys index 3458df6fc6..791c3005a4 100644 --- a/.rootkeys +++ b/.rootkeys @@ -657,7 +657,6 @@ 3e5a4e68TJJavrunYwTAnLRSBxSYqQ xenolinux-2.4.25-sparse/kernel/panic.c 3f9d4b44247udoqWEgFkaHiWv6Uvyg xenolinux-2.4.25-sparse/kernel/time.c 401c059bjLBFYHRD4Py2uM3eA1D4zQ xenolinux-2.4.25-sparse/kernel/timer.c -3eba8f878XjouY21EkQBXwYBsPsipQ xenolinux-2.4.25-sparse/lndir-rel 3e6e7c1efbQe93xCvOpOVCnXTMmQ5w xenolinux-2.4.25-sparse/mkbuildtree 3e5a4e68GxCIaFH4sy01v1wjapetaA xenolinux-2.4.25-sparse/mm/memory.c 3f108af5VxPkLv13tXpXgoRKALQtXQ xenolinux-2.4.25-sparse/mm/mprotect.c diff --git a/xenolinux-2.4.25-sparse/lndir-rel b/xenolinux-2.4.25-sparse/lndir-rel deleted file mode 100755 index d0bd8632029810e754848a56de26f531ed3d8f8f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15929 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 diff --git a/xenolinux-2.4.25-sparse/mkbuildtree b/xenolinux-2.4.25-sparse/mkbuildtree index d9ea5b6510..a2c048fa97 100755 --- a/xenolinux-2.4.25-sparse/mkbuildtree +++ b/xenolinux-2.4.25-sparse/mkbuildtree @@ -49,15 +49,39 @@ abs_to_rel () [ "${DESTPATH##*[^/]}" = "/" ] && DESTPATH=${DESTPATH%?} } +# relative_lndir +# Creates a tree of symlinks in the current working directory that mirror +# real files in . should be relative to the current +# working directory. Symlinks in are ignored. Source-control files +# are ignored. +relative_lndir () +{ + local SYMLINK_DIR REAL_DIR pref i j + SYMLINK_DIR=$PWD + REAL_DIR=$1 + ( + cd $REAL_DIR + for i in `find . -type d | grep -v SCCS`; do + [ -d $SYMLINK_DIR/$i ] || mkdir -p $SYMLINK_DIR/$i + ( + cd $i + pref=`echo $i | sed -e 's#/[^/]*#../#g' -e 's#^\.##'` + for j in `find . -type f -maxdepth 1`; do + ln -sf ${pref}${REAL_DIR}/$i/$j ${SYMLINK_DIR}/$i/$j + done + ) + done + ) +} [ "$1" == "" ] && { echo "Syntax: $0 "; exit 1; } # Get absolute path to the destination directory pushd . >/dev/null cd ${1} -AD=`pwd` +AD=$PWD popd >/dev/null - + # Get absolute path to the source directory AS=`pwd` @@ -71,9 +95,12 @@ for i in `find . -type f -o -type l` ; do rm -f ${AD}/${i#./} ; done # We now work from the destination directory cd ${AD} +# Remove old symlinks +for i in `find . -type l`; do rm -f $i; done + # Create symlinks of files and directories which exist in the sparse source -${AS}/lndir-rel -silent ${RS} -rm -f mkbuildtree lndir-rel +relative_lndir ${RS} +rm -f mkbuildtree ## There are a whole bunch of special symlinks, mostly for files ## which are identical in the i386 and xeno-i386 architecture-dependent @@ -83,7 +110,7 @@ rm -f mkbuildtree lndir-rel rm -rf ${AD}/include/asm-xeno/hypervisor-ifs mkdir ${AD}/include/asm-xeno/hypervisor-ifs cd ${AD}/include/asm-xeno/hypervisor-ifs -${AS}/lndir-rel -silent ../../../${RS}/../xen/include/hypervisor-ifs +relative_lndir ../../../${RS}/../xen/include/hypervisor-ifs # The remainder are the i386 -> xeno-i386 links cd .. -- 2.30.2